From cf62c83b0e316a50ac983f29c9921a9fbd7e6113 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Tue, 3 Jun 2008 18:08:48 +0000 Subject: [PATCH] bnc355225 - File chooser crash in Tab completion 2008-06-03 Federico Mena Quintero * gtk/gtkfilechooserentry.c (install_completion_feedback_timer): If the user presses Tab while the completion feedback window is active, then we'll assert. Remove the assertion and just re-set the timer. Fixes https://bugzilla.novell.com/show_bug.cgi?id=355225 Signed-off-by: Federico Mena Quintero svn path=/trunk/; revision=20305 --- ChangeLog | 7 +++++++ gtk/gtkfilechooserentry.c | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 70165ae039..44f8c04eae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-06-03 Federico Mena Quintero + + * gtk/gtkfilechooserentry.c (install_completion_feedback_timer): + If the user presses Tab while the completion feedback window is + active, then we'll assert. Remove the assertion and just re-set + the timer. Fixes https://bugzilla.novell.com/show_bug.cgi?id=355225 + 2008-06-03 Colin Walters Bug 535303 – add _get_implementation to GtkStatusIcon diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c index aef6d312c8..a98041aabd 100644 --- a/gtk/gtkfilechooserentry.c +++ b/gtk/gtkfilechooserentry.c @@ -939,7 +939,8 @@ completion_feedback_timeout_cb (gpointer data) static void install_completion_feedback_timer (GtkFileChooserEntry *chooser_entry) { - g_assert (chooser_entry->completion_feedback_timeout_id == 0); + if (chooser_entry->completion_feedback_timeout_id != 0) + g_source_remove (chooser_entry->completion_feedback_timeout_id); chooser_entry->completion_feedback_timeout_id = gdk_threads_add_timeout (COMPLETION_FEEDBACK_TIMEOUT_MS, completion_feedback_timeout_cb, -- 2.30.2